Autogenerated HTML docs for v1.5.4.3-325-g6d21
diff --git a/config.txt b/config.txt index fb6dae0..4027726 100644 --- a/config.txt +++ b/config.txt
@@ -379,10 +379,14 @@ branch.autosetupmerge:: Tells `git-branch` and `git-checkout` to setup new branches - so that linkgit:git-pull[1] will appropriately merge from that - remote branch. Note that even if this option is not set, + so that linkgit:git-pull[1] will appropriately merge from the + starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to true. + and `--no-track` options. The valid settings are: `false` -- no + automatic setup is done; `true` -- automatic setup is done when the + starting point is a remote branch; `always` -- automatic setup is + done when the starting point is either a local branch or remote + branch. This option defaults to true. branch.<name>.remote:: When in branch <name>, it tells `git fetch` which remote to fetch. @@ -812,6 +816,8 @@ warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. pack.indexVersion:: Specify the default pack index version. Valid values are 1 for @@ -897,6 +903,17 @@ archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]. +url.<base>.insteadOf:: + Any URL that starts with this value will be rewritten to + start, instead, with <base>. In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. + user.email:: Your email address to be recorded in any newly created commits. Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
diff --git a/diff-options.txt b/diff-options.txt index 8d35cbd..8dc5b00 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -170,6 +170,14 @@ Swap two inputs; that is, show differences from index or on-disk file to tree contents. +--relative[=<path>]:: + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. + --text:: Treat all files as text.
diff --git a/git-branch.html b/git-branch.html index 227436d..6e1bc8b 100644 --- a/git-branch.html +++ b/git-branch.html
@@ -297,11 +297,10 @@ working tree to it; use "git checkout <newbranch>" to switch to the new branch.</p> <p>When a local branch is started off a remote branch, git sets up the -branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that -remote branch. If this behavior is not desired, it is possible to -disable it using the global <tt>branch.autosetupmerge</tt> configuration -flag. That setting can be overridden by using the <tt>--track</tt> -and <tt>--no-track</tt> options.</p> +branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from +the remote branch. This behavior may be changed via the global +<tt>branch.autosetupmerge</tt> configuration flag. That setting can be +overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p> <p>With a <em>-m</em> or <em>-M</em> option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch @@ -433,14 +432,16 @@ </dt> <dd> <p> - Set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - <em>--no-track</em> were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to <tt>false</tt> if you want + git-checkout and git-branch to always behave as if <em>--no-track</em> were + given. Set it to <tt>always</tt> if you want this behavior when the + start-point is either a local or remote branch. </p> </dd> <dt> @@ -448,10 +449,7 @@ </dt> <dd> <p> - When a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. </p> </dd> <dt> @@ -566,7 +564,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-Feb-2008 03:18:04 UTC +Last updated 28-Feb-2008 00:25:37 UTC </div> </div> </body>
diff --git a/git-branch.txt b/git-branch.txt index 7e8874a..6f07a17 100644 --- a/git-branch.txt +++ b/git-branch.txt
@@ -35,11 +35,10 @@ new branch. When a local branch is started off a remote branch, git sets up the -branch so that linkgit:git-pull[1] will appropriately merge from that -remote branch. If this behavior is not desired, it is possible to -disable it using the global `branch.autosetupmerge` configuration -flag. That setting can be overridden by using the `--track` -and `--no-track` options. +branch so that linkgit:git-pull[1] will appropriately merge from +the remote branch. This behavior may be changed via the global +`branch.autosetupmerge` configuration flag. That setting can be +overridden by using the `--track` and `--no-track` options. With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match @@ -105,20 +104,19 @@ Display the full sha1s in output listing rather than abbreviating them. --track:: - Set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - '--no-track' were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to `false` if you want + git-checkout and git-branch to always behave as if '--no-track' were + given. Set it to `always` if you want this behavior when the + start-point is either a local or remote branch. --no-track:: - When a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. <branchname>:: The name of the branch to create or delete.
diff --git a/git-checkout.html b/git-checkout.html index 83420b0..e5a74dd 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -330,15 +330,16 @@ </dt> <dd> <p> - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - <em>--no-track</em> were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to <tt>false</tt> if you want + git-checkout and git-branch to always behave as if <em>--no-track</em> were + given. Set it to <tt>always</tt> if you want this behavior when the + start-point is either a local or remote branch. </p> </dd> <dt> @@ -346,10 +347,7 @@ </dt> <dd> <p> - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. </p> </dd> <dt> @@ -541,7 +539,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-Feb-2008 03:18:04 UTC +Last updated 28-Feb-2008 00:25:37 UTC </div> </div> </body>
diff --git a/git-checkout.txt b/git-checkout.txt index b4cfa04..4014e72 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -48,21 +48,19 @@ may restrict the characters allowed in a branch name. --track:: - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will automatically - retrieve data from the remote branch. Use this if you always - pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. - This behavior is the default. Set the - branch.autosetupmerge configuration variable to false if you - want git-checkout and git-branch to always behave as if - '--no-track' were given. + When creating a new branch, set up configuration so that git-pull + will automatically retrieve data from the start point, which must be + a branch. Use this if you always pull from the same upstream branch + into the new branch, and if you don't want to use "git pull + <repository> <refspec>" explicitly. This behavior is the default + when the start point is a remote branch. Set the + branch.autosetupmerge configuration variable to `false` if you want + git-checkout and git-branch to always behave as if '--no-track' were + given. Set it to `always` if you want this behavior when the + start-point is either a local or remote branch. --no-track:: - When -b is given and a branch is created off a remote branch, - set up configuration so that git-pull will not retrieve data - from the remote branch, ignoring the branch.autosetupmerge - configuration variable. + Ignore the branch.autosetupmerge configuration variable. -l:: Create the new branch's reflog. This activates recording of
diff --git a/git-clone.html b/git-clone.html index 737769d..958f977 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -573,6 +573,24 @@ </ul> </div></div> <p>They are equivalent, except the former implies --local option.</p> +<p>If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "<actual url base>"] + insteadOf = <other url base></tt></pre> +</div></div> +<p>For example, with this:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work:</tt></pre> +</div></div> +<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> </div> <h2>Examples</h2> <div class="sectionbody"> @@ -646,7 +664,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 14-Feb-2008 00:51:07 UTC +Last updated 28-Feb-2008 00:25:37 UTC </div> </div> </body>
diff --git a/git-config.html b/git-config.html index d380da1..c826e1a 100644 --- a/git-config.html +++ b/git-config.html
@@ -1204,10 +1204,14 @@ <dd> <p> Tells <tt>git-branch</tt> and <tt>git-checkout</tt> to setup new branches - so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that - remote branch. Note that even if this option is not set, + so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the + starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the <tt>--track</tt> - and <tt>--no-track</tt> options. This option defaults to true. + and <tt>--no-track</tt> options. The valid settings are: <tt>false</tt> — no + automatic setup is done; <tt>true</tt> — automatic setup is done when the + starting point is a remote branch; <tt>always</tt> — automatic setup is + done when the starting point is either a local branch or remote + branch. This option defaults to true. </p> </dd> <dt> @@ -2002,6 +2006,8 @@ warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. </p> </dd> <dt> @@ -2175,6 +2181,22 @@ </p> </dd> <dt> +url.<base>.insteadOf +</dt> +<dd> +<p> + Any URL that starts with this value will be rewritten to + start, instead, with <base>. In cases where some site serves a + large number of repositories, and serves them with multiple + access methods, and some users need to use different access + methods, this feature allows people to specify any of the + equivalent URLs and have git automatically rewrite the URL to + the best alternative for the particular user, even for a + never-before-seen repository on the site. When more than one + insteadOf strings match a given URL, the longest match is used. +</p> +</dd> +<dt> user.email </dt> <dd> @@ -2286,7 +2308,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 25-Feb-2008 08:40:21 UTC +Last updated 28-Feb-2008 00:25:38 UTC </div> </div> </body>
diff --git a/git-describe.html b/git-describe.html index 7c33eea..6e851d7 100644 --- a/git-describe.html +++ b/git-describe.html
@@ -338,6 +338,16 @@ candidates to describe the input committish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. + An <n> of 0 will cause only exact matches to be output. +</p> +</dd> +<dt> +--exact-match +</dt> +<dd> +<p> + Only output exact matches (a tag directly references the + supplied commit). This is a synonym for --candidates=0. </p> </dd> <dt> @@ -437,7 +447,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-Feb-2008 03:18:05 UTC +Last updated 28-Feb-2008 00:25:38 UTC </div> </div> </body>
diff --git a/git-describe.txt b/git-describe.txt index 1c3dfb4..fbb40a2 100644 --- a/git-describe.txt +++ b/git-describe.txt
@@ -45,6 +45,11 @@ candidates to describe the input committish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. + An <n> of 0 will cause only exact matches to be output. + +--exact-match:: + Only output exact matches (a tag directly references the + supplied commit). This is a synonym for --candidates=0. --debug:: Verbosely display information about the searching strategy
diff --git a/git-diff-files.html b/git-diff-files.html index 585729d..2e44b69 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -601,6 +601,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -1261,7 +1274,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:13 UTC +Last updated 28-Feb-2008 00:25:38 UTC </div> </div> </body>
diff --git a/git-diff-index.html b/git-diff-index.html index c333894..37b68cb 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -602,6 +602,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -1343,7 +1356,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:13 UTC +Last updated 28-Feb-2008 00:25:39 UTC </div> </div> </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html index 09afd55..053b7db 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -604,6 +604,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -1731,7 +1744,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:15 UTC +Last updated 28-Feb-2008 00:25:39 UTC </div> </div> </body>
diff --git a/git-diff.html b/git-diff.html index 9f1a128..8983b85 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -680,6 +680,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -1458,7 +1471,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:15 UTC +Last updated 28-Feb-2008 00:25:41 UTC </div> </div> </body>
diff --git a/git-fetch.html b/git-fetch.html index 5b7174a..a9c3438 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -594,6 +594,24 @@ </div></div> <p>They are mostly equivalent, except when cloning. See <a href="git-clone.html">git-clone(1)</a> for details.</p> +<p>If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "<actual url base>"] + insteadOf = <other url base></tt></pre> +</div></div> +<p>For example, with this:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work:</tt></pre> +</div></div> +<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> </div> <h2>REMOTES</h2> <div class="sectionbody"> @@ -663,7 +681,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 27-Jan-2008 08:23:28 UTC +Last updated 28-Feb-2008 00:25:41 UTC </div> </div> </body>
diff --git a/git-format-patch.html b/git-format-patch.html index cf1875e..e149dd0 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -281,6 +281,8 @@ [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--subject-prefix=Subject-Prefix] + [--cc=<email>] + [--cover-letter] [ <since> | <revision range> ]</div></div> </div> <h2>DESCRIPTION</h2> @@ -648,6 +650,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -913,6 +928,25 @@ </p> </dd> <dt> +--cc=<email> +</dt> +<dd> +<p> + Add a "Cc:" header to the email headers. This is in addition + to any configured headers, and may be used multiple times. +</p> +</dd> +<dt> +--cover-letter +</dt> +<dd> +<p> + Generate a cover letter template. You still have to fill in + a description, but the shortlog and the diffstat will be + generated for you. +</p> +</dd> +<dt> --suffix=.<sfx> </dt> <dd> @@ -1017,7 +1051,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:21 UTC +Last updated 28-Feb-2008 00:25:42 UTC </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 651efe6..b5207b7 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -10,13 +10,15 @@ -------- [verse] 'git-format-patch' [-k] [-o <dir> | --stdout] [--thread] - [--attach[=<boundary>] | --inline[=<boundary>]] - [-s | --signoff] [<common diff options>] - [-n | --numbered | -N | --no-numbered] - [--start-number <n>] [--numbered-files] - [--in-reply-to=Message-Id] [--suffix=.<sfx>] - [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] + [--attach[=<boundary>] | --inline[=<boundary>]] + [-s | --signoff] [<common diff options>] + [-n | --numbered | -N | --no-numbered] + [--start-number <n>] [--numbered-files] + [--in-reply-to=Message-Id] [--suffix=.<sfx>] + [--ignore-if-in-upstream] + [--subject-prefix=Subject-Prefix] + [--cc=<email>] + [--cover-letter] [ <since> | <revision range> ] DESCRIPTION @@ -135,6 +137,15 @@ allows for useful naming of a patch series, and can be combined with the --numbered option. +--cc=<email>:: + Add a "Cc:" header to the email headers. This is in addition + to any configured headers, and may be used multiple times. + +--cover-letter:: + Generate a cover letter template. You still have to fill in + a description, but the shortlog and the diffstat will be + generated for you. + --suffix=.<sfx>:: Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is
diff --git a/git-log.html b/git-log.html index ab8cdb1..0c3eba7 100644 --- a/git-log.html +++ b/git-log.html
@@ -602,6 +602,19 @@ </p> </dd> <dt> +--relative[=<path>] +</dt> +<dd> +<p> + When run from a subdirectory of the project, it can be + told to exclude changes outside the directory and show + pathnames relative to it with this option. When you are + not in a subdirectory (e.g. in a bare repository), you + can name which subdirectory to make the output relative + to by giving a <path> as an argument. +</p> +</dd> +<dt> --text </dt> <dd> @@ -1043,6 +1056,15 @@ </p> </dd> <dt> +-F, --fixed-strings +</dt> +<dd> +<p> + Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). +</p> +</dd> +<dt> --remove-empty </dt> <dd> @@ -1894,7 +1916,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2008 08:01:34 UTC +Last updated 28-Feb-2008 00:25:42 UTC </div> </div> </body>
diff --git a/git-pack-objects.html b/git-pack-objects.html index 7d55249..c497960 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html
@@ -530,6 +530,8 @@ This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. </p> </dd> <dt> @@ -564,7 +566,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 10-Feb-2008 10:47:42 UTC +Last updated 28-Feb-2008 00:25:42 UTC </div> </div> </body>
diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 8353be1..5c1bd3b 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -177,6 +177,8 @@ This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. + Specifying 0 will cause git to auto-detect the number of CPU's + and set the number of threads accordingly. --index-version=<version>[,<offset>]:: This is intended to be used by the test suite only. It allows
diff --git a/git-pull.html b/git-pull.html index 0cc7084..e6d2f82 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -705,6 +705,24 @@ </div></div> <p>They are mostly equivalent, except when cloning. See <a href="git-clone.html">git-clone(1)</a> for details.</p> +<p>If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "<actual url base>"] + insteadOf = <other url base></tt></pre> +</div></div> +<p>For example, with this:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work:</tt></pre> +</div></div> +<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> </div> <h2>REMOTES</h2> <div class="sectionbody"> @@ -973,7 +991,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 20-Feb-2008 10:44:09 UTC +Last updated 28-Feb-2008 00:25:43 UTC </div> </div> </body>
diff --git a/git-push.html b/git-push.html index 6ada41e..0f3679b 100644 --- a/git-push.html +++ b/git-push.html
@@ -522,6 +522,24 @@ </div></div> <p>They are mostly equivalent, except when cloning. See <a href="git-clone.html">git-clone(1)</a> for details.</p> +<p>If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "<actual url base>"] + insteadOf = <other url base></tt></pre> +</div></div> +<p>For example, with this:</p> +<div class="listingblock"> +<div class="content"> +<pre><tt> [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work:</tt></pre> +</div></div> +<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p> </div> <h2>REMOTES</h2> <div class="sectionbody"> @@ -709,7 +727,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 20-Feb-2008 10:44:09 UTC +Last updated 28-Feb-2008 00:25:43 UTC </div> </div> </body>
diff --git a/git-rev-list.html b/git-rev-list.html index 0173f66..bf709ac 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -295,6 +295,7 @@ [ --(author|committer|grep)=<pattern> ] [ --regexp-ignore-case | \-i ] [ --extended-regexp | \-E ] + [ --fixed-strings | \-F ] [ --date={local|relative|default|iso|rfc|short} ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] @@ -596,6 +597,15 @@ </p> </dd> <dt> +-F, --fixed-strings +</dt> +<dd> +<p> + Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). +</p> +</dd> +<dt> --remove-empty </dt> <dd> @@ -1191,7 +1201,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2008 08:01:34 UTC +Last updated 28-Feb-2008 00:25:44 UTC </div> </div> </body> diff --git a/git-rev-list.txt b/git-rev-list.txt index 5b96eab..a8d489f 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt
@@ -31,6 +31,7 @@ [ \--(author|committer|grep)=<pattern> ] [ \--regexp-ignore-case | \-i ] [ \--extended-regexp | \-E ] + [ \--fixed-strings | \-F ] [ \--date={local|relative|default|iso|rfc|short} ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] diff --git a/git-svn.html b/git-svn.html index dca6f71..c5b2af3 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -553,6 +553,16 @@ </p> </dd> </dl> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<div class="title">Note</div> +</td> +<td class="content">SVN itself only stores times in UTC and nothing else. The regular svn +client converts the UTC time to the local time (or based on the TZ= +environment). This command has the same behaviour.</td> +</tr></table> +</div> <p>Any other arguments are passed directly to `git log'</p> </dd> <dt> @@ -1085,7 +1095,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-Feb-2008 03:18:07 UTC +Last updated 28-Feb-2008 00:25:44 UTC </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index 340f1be..bec9acc 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -159,6 +159,10 @@ our version of --pretty=oneline -- + +NOTE: SVN itself only stores times in UTC and nothing else. The regular svn +client converts the UTC time to the local time (or based on the TZ= +environment). This command has the same behaviour. ++ Any other arguments are passed directly to `git log' 'blame'::
diff --git a/rev-list-options.txt b/rev-list-options.txt index a8138e2..259072c 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt
@@ -153,6 +153,11 @@ Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions. +-F, --fixed-strings:: + + Consider the limiting patterns to be fixed strings (don't interpret + pattern as a regular expression). + --remove-empty:: Stop when a given path disappears from the tree.
diff --git a/urls.txt b/urls.txt index 81ac17f..fa34c67 100644 --- a/urls.txt +++ b/urls.txt
@@ -44,3 +44,26 @@ ifdef::git-clone[] They are equivalent, except the former implies --local option. endif::git-clone[] + + +If there are a large number of similarly-named remote repositories and +you want to use a different format for them (such that the URLs you +use will be rewritten into URLs that work), you can create a +configuration section of the form: + +------------ + [url "<actual url base>"] + insteadOf = <other url base> +------------ + +For example, with this: + +------------ + [url "git://git.host.xz/"] + insteadOf = host.xz:/path/to/ + insteadOf = work: +------------ + +a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be +rewritten in any context that takes a URL to be "git://git.host.xz/repo.git". +
